Updated API signature files for AndroidX. This is for the issue of fields representing companion objects not being marked with annotations in signature files. See the buganizer below for more information. Bug: 401235591 Test: N/A Relnote: N/A Change-Id: I50887923d6dbfeb32a475b6dcc45f71b7be7b4d4
diff --git a/busytown/androidx_with_metalava.sh b/busytown/androidx_with_metalava.sh index 98623e8..fa03981 100755 --- a/busytown/androidx_with_metalava.sh +++ b/busytown/androidx_with_metalava.sh
@@ -4,7 +4,7 @@ # Use this flag to temporarily disable `checkApi` # while landing Metalava w/ breaking API changes -METALAVA_INTEGRATION_ENFORCED=false +METALAVA_INTEGRATION_ENFORCED=true # The default targets to build if no arguments # are provided on the command line.
diff --git a/camera/camera-core/api/current.txt b/camera/camera-core/api/current.txt index 4e41cfa..d096e58 100644 --- a/camera/camera-core/api/current.txt +++ b/camera/camera-core/api/current.txt
@@ -785,7 +785,7 @@ @SuppressCompatibility @androidx.camera.core.ExperimentalSessionConfig public abstract class GroupableFeature { method @InaccessibleFromKotlin public final int getFeatureType(); property public final int featureType; - field public static final androidx.camera.core.featuregroup.GroupableFeature.Companion Companion; + field @SuppressCompatibility @androidx.camera.core.ExperimentalSessionConfig public static final androidx.camera.core.featuregroup.GroupableFeature.Companion Companion; field public static final int FEATURE_TYPE_DYNAMIC_RANGE = 0; // 0x0 field public static final int FEATURE_TYPE_FPS_RANGE = 1; // 0x1 field public static final int FEATURE_TYPE_IMAGE_FORMAT = 3; // 0x3 diff --git a/camera/camera-core/api/restricted_current.txt b/camera/camera-core/api/restricted_current.txt index 4e41cfa..d096e58 100644 --- a/camera/camera-core/api/restricted_current.txt +++ b/camera/camera-core/api/restricted_current.txt
@@ -785,7 +785,7 @@ @SuppressCompatibility @androidx.camera.core.ExperimentalSessionConfig public abstract class GroupableFeature { method @InaccessibleFromKotlin public final int getFeatureType(); property public final int featureType; - field public static final androidx.camera.core.featuregroup.GroupableFeature.Companion Companion; + field @SuppressCompatibility @androidx.camera.core.ExperimentalSessionConfig public static final androidx.camera.core.featuregroup.GroupableFeature.Companion Companion; field public static final int FEATURE_TYPE_DYNAMIC_RANGE = 0; // 0x0 field public static final int FEATURE_TYPE_FPS_RANGE = 1; // 0x1 field public static final int FEATURE_TYPE_IMAGE_FORMAT = 3; // 0x3 diff --git a/compose/foundation/foundation-layout/api/current.txt b/compose/foundation/foundation-layout/api/current.txt index 6ad62c3..a204c35 100644 --- a/compose/foundation/foundation-layout/api/current.txt +++ b/compose/foundation/foundation-layout/api/current.txt
@@ -130,7 +130,7 @@ } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public final class ContextualFlowColumnOverflow extends androidx.compose.foundation.layout.FlowLayoutOverflow { - field @Deprecated public static final androidx.compose.foundation.layout.ContextualFlowColumnOverflow.Companion Companion; + field @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final androidx.compose.foundation.layout.ContextualFlowColumnOverflow.Companion Companion; } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final class ContextualFlowColumnOverflow.Companion { @@ -167,7 +167,7 @@ } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public final class ContextualFlowRowOverflow extends androidx.compose.foundation.layout.FlowLayoutOverflow { - field @Deprecated public static final androidx.compose.foundation.layout.ContextualFlowRowOverflow.Companion Companion; + field @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final androidx.compose.foundation.layout.ContextualFlowRowOverflow.Companion Companion; } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final class ContextualFlowRowOverflow.Companion { @@ -200,7 +200,7 @@ } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public final class FlowColumnOverflow extends androidx.compose.foundation.layout.FlowLayoutOverflow { - field @Deprecated public static final androidx.compose.foundation.layout.FlowColumnOverflow.Companion Companion; + field @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final androidx.compose.foundation.layout.FlowColumnOverflow.Companion Companion; } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final class FlowColumnOverflow.Companion { diff --git a/compose/foundation/foundation-layout/api/restricted_current.txt b/compose/foundation/foundation-layout/api/restricted_current.txt index f0efd58..dcf8a33 100644 --- a/compose/foundation/foundation-layout/api/restricted_current.txt +++ b/compose/foundation/foundation-layout/api/restricted_current.txt
@@ -137,7 +137,7 @@ } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public final class ContextualFlowColumnOverflow extends androidx.compose.foundation.layout.FlowLayoutOverflow { - field @Deprecated public static final androidx.compose.foundation.layout.ContextualFlowColumnOverflow.Companion Companion; + field @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final androidx.compose.foundation.layout.ContextualFlowColumnOverflow.Companion Companion; } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final class ContextualFlowColumnOverflow.Companion { @@ -174,7 +174,7 @@ } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public final class ContextualFlowRowOverflow extends androidx.compose.foundation.layout.FlowLayoutOverflow { - field @Deprecated public static final androidx.compose.foundation.layout.ContextualFlowRowOverflow.Companion Companion; + field @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final androidx.compose.foundation.layout.ContextualFlowRowOverflow.Companion Companion; } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final class ContextualFlowRowOverflow.Companion { @@ -207,7 +207,7 @@ } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public final class FlowColumnOverflow extends androidx.compose.foundation.layout.FlowLayoutOverflow { - field @Deprecated public static final androidx.compose.foundation.layout.FlowColumnOverflow.Companion Companion; + field @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final androidx.compose.foundation.layout.FlowColumnOverflow.Companion Companion; } @Deprecated @SuppressCompatibility @androidx.compose.foundation.layout.ExperimentalLayoutApi public static final class FlowColumnOverflow.Companion { diff --git a/compose/material3/material3/api/current.txt b/compose/material3/material3/api/current.txt index a9dbae5..0f144fe 100644 --- a/compose/material3/material3/api/current.txt +++ b/compose/material3/material3/api/current.txt
@@ -4709,7 +4709,7 @@ method public suspend Object? scrollToItem(int item, kotlin.coroutines.Continuation<? super kotlin.Unit>); property public int currentItem; property public boolean isScrollInProgress; - field public static final androidx.compose.material3.carousel.CarouselState.Companion Companion; + field @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public static final androidx.compose.material3.carousel.CarouselState.Companion Companion; } @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public static final class CarouselState.Companion { diff --git a/compose/material3/material3/api/restricted_current.txt b/compose/material3/material3/api/restricted_current.txt index a9dbae5..0f144fe 100644 --- a/compose/material3/material3/api/restricted_current.txt +++ b/compose/material3/material3/api/restricted_current.txt
@@ -4709,7 +4709,7 @@ method public suspend Object? scrollToItem(int item, kotlin.coroutines.Continuation<? super kotlin.Unit>); property public int currentItem; property public boolean isScrollInProgress; - field public static final androidx.compose.material3.carousel.CarouselState.Companion Companion; + field @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public static final androidx.compose.material3.carousel.CarouselState.Companion Companion; } @SuppressCompatibility @androidx.compose.material3.ExperimentalMaterial3Api public static final class CarouselState.Companion { diff --git a/playground-common/playground.properties b/playground-common/playground.properties index 6eaa9c5..64743ab 100644 --- a/playground-common/playground.properties +++ b/playground-common/playground.properties
@@ -26,5 +26,5 @@ # Disable docs androidx.enableDocumentation=false androidx.playground.snapshotBuildId=13706940 -androidx.playground.metalavaBuildId=14204497 +androidx.playground.metalavaBuildId=14221387 androidx.studio.type=playground \ No newline at end of file
diff --git a/privacysandbox/ads/ads-adservices/api/1.1.0-beta13.txt b/privacysandbox/ads/ads-adservices/api/1.1.0-beta13.txt index c5ed74c..9643aa7 100644 --- a/privacysandbox/ads/ads-adservices/api/1.1.0-beta13.txt +++ b/privacysandbox/ads/ads-adservices/api/1.1.0-beta13.txt
@@ -76,7 +76,7 @@ method @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public boolean hasOutcome(); property public long adSelectionId; property public android.net.Uri renderUri; - field public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome.Companion Companion; + field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome.Companion Companion; field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome NO_OUTCOME; } @@ -339,7 +339,7 @@ property public String name; property public androidx.privacysandbox.ads.adservices.customaudience.TrustedBiddingData? trustedBiddingSignals; property public androidx.privacysandbox.ads.adservices.common.AdSelectionSignals? userBiddingSignals; - field public static final androidx.privacysandbox.ads.adservices.customaudience.CustomAudience.Companion Companion; + field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final androidx.privacysandbox.ads.adservices.customaudience.CustomAudience.Companion Companion; field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final int FLAG_AUCTION_SERVER_REQUEST_DEFAULT = 0; // 0x0 field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final int FLAG_AUCTION_SERVER_REQUEST_OMIT_ADS = 1; // 0x1 field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final double PRIORITY_DEFAULT = 0.0;
diff --git a/privacysandbox/ads/ads-adservices/api/current.txt b/privacysandbox/ads/ads-adservices/api/current.txt index c5ed74c..9643aa7 100644 --- a/privacysandbox/ads/ads-adservices/api/current.txt +++ b/privacysandbox/ads/ads-adservices/api/current.txt
@@ -76,7 +76,7 @@ method @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public boolean hasOutcome(); property public long adSelectionId; property public android.net.Uri renderUri; - field public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome.Companion Companion; + field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome.Companion Companion; field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome NO_OUTCOME; } @@ -339,7 +339,7 @@ property public String name; property public androidx.privacysandbox.ads.adservices.customaudience.TrustedBiddingData? trustedBiddingSignals; property public androidx.privacysandbox.ads.adservices.common.AdSelectionSignals? userBiddingSignals; - field public static final androidx.privacysandbox.ads.adservices.customaudience.CustomAudience.Companion Companion; + field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final androidx.privacysandbox.ads.adservices.customaudience.CustomAudience.Companion Companion; field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final int FLAG_AUCTION_SERVER_REQUEST_DEFAULT = 0; // 0x0 field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final int FLAG_AUCTION_SERVER_REQUEST_OMIT_ADS = 1; // 0x1 field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final double PRIORITY_DEFAULT = 0.0;
diff --git a/privacysandbox/ads/ads-adservices/api/restricted_1.1.0-beta13.txt b/privacysandbox/ads/ads-adservices/api/restricted_1.1.0-beta13.txt index c5ed74c..9643aa7 100644 --- a/privacysandbox/ads/ads-adservices/api/restricted_1.1.0-beta13.txt +++ b/privacysandbox/ads/ads-adservices/api/restricted_1.1.0-beta13.txt
@@ -76,7 +76,7 @@ method @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public boolean hasOutcome(); property public long adSelectionId; property public android.net.Uri renderUri; - field public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome.Companion Companion; + field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome.Companion Companion; field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome NO_OUTCOME; } @@ -339,7 +339,7 @@ property public String name; property public androidx.privacysandbox.ads.adservices.customaudience.TrustedBiddingData? trustedBiddingSignals; property public androidx.privacysandbox.ads.adservices.common.AdSelectionSignals? userBiddingSignals; - field public static final androidx.privacysandbox.ads.adservices.customaudience.CustomAudience.Companion Companion; + field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final androidx.privacysandbox.ads.adservices.customaudience.CustomAudience.Companion Companion; field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final int FLAG_AUCTION_SERVER_REQUEST_DEFAULT = 0; // 0x0 field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final int FLAG_AUCTION_SERVER_REQUEST_OMIT_ADS = 1; // 0x1 field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final double PRIORITY_DEFAULT = 0.0;
diff --git a/privacysandbox/ads/ads-adservices/api/restricted_current.txt b/privacysandbox/ads/ads-adservices/api/restricted_current.txt index c5ed74c..9643aa7 100644 --- a/privacysandbox/ads/ads-adservices/api/restricted_current.txt +++ b/privacysandbox/ads/ads-adservices/api/restricted_current.txt
@@ -76,7 +76,7 @@ method @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public boolean hasOutcome(); property public long adSelectionId; property public android.net.Uri renderUri; - field public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome.Companion Companion; + field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome.Companion Companion; field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome NO_OUTCOME; } @@ -339,7 +339,7 @@ property public String name; property public androidx.privacysandbox.ads.adservices.customaudience.TrustedBiddingData? trustedBiddingSignals; property public androidx.privacysandbox.ads.adservices.common.AdSelectionSignals? userBiddingSignals; - field public static final androidx.privacysandbox.ads.adservices.customaudience.CustomAudience.Companion Companion; + field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final androidx.privacysandbox.ads.adservices.customaudience.CustomAudience.Companion Companion; field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final int FLAG_AUCTION_SERVER_REQUEST_DEFAULT = 0; // 0x0 field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final int FLAG_AUCTION_SERVER_REQUEST_OMIT_ADS = 1; // 0x1 field @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext14OptIn public static final double PRIORITY_DEFAULT = 0.0;
diff --git a/tracing/tracing-driver/api/restricted_current.txt b/tracing/tracing-driver/api/restricted_current.txt index cace383..5009125 100644 --- a/tracing/tracing-driver/api/restricted_current.txt +++ b/tracing/tracing-driver/api/restricted_current.txt
@@ -61,6 +61,7 @@ property public String name; property @kotlin.PublishedApi internal final java.util.concurrent.atomic.AtomicInteger started; property public androidx.tracing.driver.FlowToken token; + field @kotlin.PublishedApi internal static final androidx.tracing.driver.PlatformThreadContextElement.Companion Companion; field @kotlin.PublishedApi internal static final kotlin.coroutines.CoroutineContext.Key<androidx.tracing.driver.PlatformThreadContextElement<? extends java.lang.Object?>> KEY; field @kotlin.PublishedApi internal static final int STATE_BEGIN = 1; // 0x1 field @kotlin.PublishedApi internal static final int STATE_END = 0; // 0x0
diff --git a/xr/scenecore/scenecore-runtime/api/restricted_current.txt b/xr/scenecore/scenecore-runtime/api/restricted_current.txt index 944ac66..ca1cce4 100644 --- a/xr/scenecore/scenecore-runtime/api/restricted_current.txt +++ b/xr/scenecore/scenecore-runtime/api/restricted_current.txt
@@ -776,7 +776,7 @@ property public abstract boolean isPreferredSpatialEnvironmentActive; property public abstract float preferredPassthroughOpacity; property public abstract androidx.xr.scenecore.runtime.SpatialEnvironment.SpatialEnvironmentPreference? preferredSpatialEnvironment; - field public static final androidx.xr.scenecore.runtime.SpatialEnvironment.Companion Companion; + field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final androidx.xr.scenecore.runtime.SpatialEnvironment.Companion Companion; field public static final float NO_PASSTHROUGH_OPACITY_PREFERENCE = (-1.0f/0.0f); }
